Autogenerated HTML docs for v2.0.0-153-g79dcc
diff --git a/git-mergetool.html b/git-mergetool.html index 12f635f..b88de16 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -831,6 +831,9 @@ <p> Don’t prompt before each invocation of the merge resolution program. + This is the default if the merge resolution program is + explicitly specified with the <tt>--tool</tt> option or with the + <tt>merge.tool</tt> configuration variable. </p> </dd> <dt class="hdlist1"> @@ -838,9 +841,8 @@ </dt> <dd> <p> - Prompt before each invocation of the merge resolution program. - This is the default behaviour; the option is provided to - override any configuration settings. + Prompt before each invocation of the merge resolution program + to give the user a chance to skip the path. </p> </dd> </dl></div> @@ -867,7 +869,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2014-06-03 15:14:46 PDT </div> </div> </body>
